From 51ddee98d1d7da127dfe2d712363ee06aa000d30 Mon Sep 17 00:00:00 2001
From: Rene Engelhard <rene@debian.org>
Date: Sun, 21 Feb 2016 02:20:43 +0100
Subject: [PATCH] [PATCH] Revert "always support packagekit if dbus is enabled"

This reverts commit f2984e95740cfbb9c74574f2a1225af3411d4901.

Gbp-Pq: Name no-packagekit-per-default.diff
---
 Repository.mk                                 |   2 +-
 RepositoryExternal.mk                         |   6 ++++++
 config_host.mk.in                             |   1 +
 configure.ac                                  | Bin 466868 -> 467414 bytes
 .../data/org/openoffice/Office/Common.xcu     |   4 ++--
 .../schema/org/openoffice/Office/Common.xcs   | Bin 264457 -> 264459 bytes
 postprocess/Rdb_services.mk                   |   4 +++-
 sfx2/source/appl/appserv.cxx                  |   6 ++++++
 shell/Module_shell.mk                         |   2 ++
 svtools/source/misc/langhelp.cxx              |   3 +--
 sw/source/uibase/app/apphdl.cxx               |   8 ++++++++
 11 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/Repository.mk b/Repository.mk
index e447757bcb8..b49c498261b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -307,7 +307,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,onlineupdate, \
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
 	$(if $(ENABLE_EVOAB2),evoab) \
 	$(if $(ENABLE_GTK3),vclplug_gtk3) \
-	$(if $(ENABLE_GIO),losessioninstall) \
+	$(if $(ENABLE_PACKAGEKIT),losessioninstall) \
 	$(if $(ENABLE_GIO),ucpgio1) \
 ))
 
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 0029ae7bc69..31275255239 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2635,6 +2635,12 @@ $(call gb_LinkTarget_set_include,$(1),\
 	$(DBUS_CFLAGS) \
 )
 
+ifeq ($(ENABLE_PACKAGEKIT),TRUE)
+$(call gb_LinkTarget_add_defs,$(1),\
+    -DENABLE_PACKAGEKIT \
+)
+endif # ENABLE_PACKAGEKIT
+
 $(call gb_LinkTarget_add_libs,$(1),\
 	$(DBUS_LIBS) \
 )
diff --git a/config_host.mk.in b/config_host.mk.in
index 81d09e48da7..52ac6e33192 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -167,6 +167,7 @@ export ENABLE_OOENV=@ENABLE_OOENV@
 export ENABLE_OPENGL_TRANSITIONS=@ENABLE_OPENGL_TRANSITIONS@
 export ENABLE_OPENGL_CANVAS=@ENABLE_OPENGL_CANVAS@
 export ENABLE_OPTIMIZED=@ENABLE_OPTIMIZED@
+export ENABLE_PACKAGEKIT=@ENABLE_PACKAGEKIT@
 export ENABLE_PCH=@ENABLE_PCH@
 export ENABLE_PDFIMPORT=@ENABLE_PDFIMPORT@
 export ENABLE_PDFIUM=@ENABLE_PDFIUM@
diff --git a/configure.ac b/configure.ac
index 573109028edcefbf53226b8a784ac942a453b0fe..db288e9b424d4ae7f9bd65baecf37ca4b3316f52 100644
GIT binary patch
delta 379
zcmdn8U*_6jnGJVVPc}R!GMQtInz*BLykn4iysMw1laH%LL1J=tVtQ(J=JZA`M#;$y
z6WO`oLM4+OmMcw8SuJ2!TAZ1eu7Hrx<5GZupv?4)5{10{a)pwN#1e(fVui%gl6-}<
z{5&8huec;JCug$b9@%E+HSNx87=f4xh?#+yWxMkl)(r}B$SM`eG82)kiPhwqzU%_4
z{Pfp>Y~0iTZ)WD0{(lQIj}pQmN(#D(3Q8)ed5K9msqqN$>4|SxBm^LSj1O>h_I7l4
z_4b_3$jv4<Jz*~k*YyAD%)El=@*&d=t3e99nc1iNrLb{Mzp#i&P(Vi^C8@MnAtkdI
rWJ!wN^oxE>Vq9=TL#7wDGs{fhe~XQ4@|-nd?VM*>w{xClTO9-de&U50

delta 85
zcmcb1SZ2$9nGJVVOXw&hmX_q_CYEF-E2QP;l_+H96_+ID<V=2eR%G&r)oPP}Y!+>P
nvZnpX8b%;y0%B$$X4(E^4eJJl$+m07+O^NKZr47~wmJv^;7BO*

diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index 24125bf454f..766575f849d 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -551,10 +551,10 @@
   </node>
   <node oor:name="PackageKit">
       <prop oor:name="EnableFontInstallation" oor:type="xs:boolean">
-        <value install:module="unx">true</value>
+        <value install:module="unx">false</value>
       </prop>
       <prop oor:name="EnableLangpackInstallation" oor:type="xs:boolean">
-        <value install:module="unx">true</value>
+        <value install:module="unx">false</value>
       </prop>
   </node>
   <node oor:name="Classification">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index cebb7d7ec0efa3b8c2a27bc6b7bcd5099ff3cf9f..b1c42ba5fe52ac2f515d6d0edbb776314b08e1c6 100644
GIT binary patch
delta 45
zcmeC2B+xxcprM7ag{g&k3(IBZ$pUsp)8+M;*`{-`u$%z$6edsbmD|qG%JPdD08L#D
A#Q*>R

delta 50
zcmeC4B+xlYprM7ag{g&k3(IBZ$rp|rPM6nXW}D8<!g2!0lb<}nS8jTa03-i)1y+{V
F%mCCz5qkgt

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index f8c5047de79..1a78bdc9629 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -198,9 +198,11 @@ $(eval $(call gb_Rdb_add_components,services,\
         canvas/source/opengl/oglcanvas \
 	) \
 	$(if $(ENABLE_GIO), \
-		shell/source/sessioninstall/losessioninstall \
 		ucb/source/ucp/gio/ucpgio \
 	) \
+	$(if $(ENABLE_PACKAGEKIT), \
+		shell/source/sessioninstall/losessioninstall \
+	) \
 	$(if $(ENABLE_GSTREAMER_1_0), \
 		avmedia/source/gstreamer/avmediagstreamer \
 	) \
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index c73d8d9d39c..0cfb99f769b 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -204,6 +204,7 @@ namespace
         // make sure we actually can instantiate services from base first
         if(!lcl_isBaseAvailable())
         {
+#if defined (ENABLE_PACKAGEKIT)
             try
             {
                 using namespace org::freedesktop::PackageKit;
@@ -218,8 +219,13 @@ namespace
             catch (const Exception &)
             {
                 TOOLS_INFO_EXCEPTION("sfx.appl", "trying to install LibreOffice Base");
+#else
+		TOOLS_INFO_EXCEPTION("sfx.appl", "missing LibreOffice Base");
+#endif
+#if defined (ENABLE_PACKAGEKIT)
             }
             return;
+#endif
         }
 
         try // fdo#48775
diff --git a/shell/Module_shell.mk b/shell/Module_shell.mk
index a223aae617e..e50b4633be7 100644
--- a/shell/Module_shell.mk
+++ b/shell/Module_shell.mk
@@ -16,11 +16,13 @@ $(eval $(call gb_Module_add_targets,shell,\
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 ifeq ($(ENABLE_GIO),TRUE)
+ifeq ($(ENABLE_PACKAGEKIT),TRUE)
 $(eval $(call gb_Module_add_targets,shell,\
 	Library_losessioninstall \
 ))
 endif
 endif
+endif
 
 ifeq ($(OS),SOLARIS)
 ifeq ($(ENABLE_GIO),TRUE)
diff --git a/svtools/source/misc/langhelp.cxx b/svtools/source/misc/langhelp.cxx
index bedd8d1205c..11cc93d6f2c 100644
--- a/svtools/source/misc/langhelp.cxx
+++ b/svtools/source/misc/langhelp.cxx
@@ -138,8 +138,7 @@ OUString getInstalledLocaleForSystemUILanguage(const css::uno::Sequence<OUString
                     else
                         aPackages.emplace_back("libreoffice-langpack-" + install);
                 }
-                //Debian would be: "The Document Foundation/Debian"
-                else if (sVendor == "The Document Foundation, Debian and Ubuntu")
+                else if (sVendor == "The Document Foundation/Debian" || sVendor == "The Document Foundation, Debian and Ubuntu")
                 {
                     // l10n is the typical Debian/Ubuntu naming convention
                     aPackages.emplace_back("libreoffice-l10n-" + install);
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index a2a2ff35b45..78a9c728b2a 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -415,6 +415,7 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
 {
     if(!lcl_hasAllComponentsAvailable())
     {
+#if defined (ENABLE_PACKAGEKIT)
         try
         {
             using namespace org::freedesktop::PackageKit;
@@ -434,15 +435,22 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( const SfxItemSet * pArgs
                 = css::task::OfficeRestartManager::get(comphelper::getProcessComponentContext());
             if (!xRestartManager->isRestartRequested(false))
             {
+#else
+            TOOLS_INFO_EXCEPTION(
+                "sw.core",
+                "missing LibreOffice Base, caught");
+#endif
                 // Base is absent, and could not initiate its install - ask user to do that manually
                 // Only show the dialog if restart is not initiated yet
                 std::unique_ptr<weld::MessageDialog> xWarnBox(Application::CreateMessageDialog(
                     nullptr, VclMessageType::Info, VclButtonsType::Ok,
                     SwResId(STR_NO_BASE_FOR_MERGE)));
                 xWarnBox->run();
+#if defined (ENABLE_PACKAGEKIT)
             }
         }
         return;
+#endif
     }
     if ( m_pView )
     {
-- 
2.30.2